housekeeping before branch

cleaned some TODOs