Cleanup some cruft in the code.