Lars Hagström - 2015-01-28

Another commit removed some more TODOs:
fd6dab82691a8f663f7579f1d5572ad9424969d1