done toying around, clean up