removes the hack from controller sign in and tweaks some files.