Tidying of Project.  Removed defunt classes