Project Cleanup

1. Deleted some old test files to reduce project side.
2. Updated TODOs.