another round of cleaning up