Fix comments,  remove old code