Removed unused function, added use of generating GET params