Cleanup Sanjay Code