Cleanup

-Cleaning up some unused directories and bad code.