Simplify POSTed data
Clean up