Cleaning up cruft from before, start anew right?