Removed useless todos. Important ones were already fixed. This fixes #4