Shibha, Shriram|Fixing smoke i.e. Removing implicit save