More cleanup and POST