Clean up some default code