Removing code cruft