new post - some cleanup left
clean up