cleanup of files and also template and login t/l changes