Remove TODO

See Issues on github for information