finish debugging
remove unused files
Final updates