I need to do some clean up!