Deleted old/redundant classes