comment out
remove unused files
Merge branch 'user'