Removed a bit of todo's