Fixed login issue and removed unused classes