|#00|+Rahul J| code cleanup,  removing warnings