bug fix
remove redundant function
code cleanup
code cleanup
move server app.js