Cleanup current_user method