Clean up some crud left lying around