Removing some TODO comments