Remove old, commented code
Implemented return-auth