Major Cleanup

Removing unused peices.