removing some TODO that wont be necessary