Complete TODO's and remove commented code, see issue #27