doing some cleanup.
TODO updated.