Removed two unnecessary todos