More clean up!