Switch to GET and code cleanup