Cleanup, preparing to convert ajax form http to resource