getting rid of dubious method
cleanup
cleanup