cleanup
started stat implementation