Clean up code cruft from all that work