Again removed some unused files