Removal of old files, some changes