merge changes from Shmulik's commit
remove build generated files
remove unused files