cleaned out old comments, dead code