cleaning up code and removing some empty files