Cleaned up a bunch of old files, and modified code to include the succinctness penalty