house keeping, comments, remove dead code