removed done TODOs #26, #27, #29, #30 and #32