ISPN-3249 Removed some commented out code