Jp636 -- Removing the extra logs and some login mods