removed done TODOs

Signed-off-by: Stefan Venz <ikstream86@gmail.com>