Updated TODO.
Removed TextureHandler dependency.