Removed some TODO