Still more clean up