Remove remaining TODOs, closes #13