remove unused files
remove login from top
merge