Nuked unused code and updated todo...