Gpii 947

http://issues.gpii.net/browse/GPII-947
all the commented out code should be removed.