clean up

without comments and tests