Ajay/DC | #2978 | Cleanup - Removing out commented out code