clean up
Pre class changes