Some clean up on security not required to run master, and it wont be required in future after the refactoring.
