Remove some code cruft