clean up
one less hack