Gpii 1018

http://issues.gpii.net/browse/GPII-1018
likewise we should remove this too.