Removed a some TODOs in the source