TODO cleanup. Fixes issue #28