Major cleanup + login working again