GH-5 Removed unused code