Gpii 1018

http://issues.gpii.net/browse/GPII-1018
If these aren't needed, we should just remove them completely.