More clean up
even more clean up