Removed some TODO stuff.