cleanup and move to POST