cleanup of login feature