Cleaning up the cruft from a bad intitial start..