clean up and no x