Clean up some more code.