is this commented block necessary ? Please uncomment or cleanup.