clean TODO, comments and obsolete code