format code and remove session-manager ns