begining to remove some of the deprecated classes
cleaned up most of the deprecated stuff