Removed Old Code

Removed Old Code in preparation for New, More Modular Code