Ajay/DC | #0000 | Cleanup - Removed commented out code