- Cleaning up obsolete files
- Still trying to address the concurrent exception defect (tricky one)