Require login, more cleanup