Gpii 803

http://issues.gpii.net/browse/GPII-803
we should remove the commented out markup.