|#000|+Anshul| code cleanup, warnings removed