cleaning up cruft
clean up