Remove TODOs from the code - fixes #3