Added a small TODO.
Removed the unneeded Properties stuff.