Remove garbage code, Add login code