Ajay/Ashwin | Cleanup - Removing unused references