Ajay/Pooja | #3199 | Fixing smoke - Removed unused references