comment code and do some cleanup