Initial Login template cleanup