Clean up steps & defs for POST requests
Extract GET request steps to own file, clean up definitions