deleted dead file
Closing a few TODO statements