clean up files
clean up engine file
code cleanup
more code cleanup