Code clean up: removing unused files