Dropping @todo's

Moving relevant TODO's to issue tracker.