test cleanup #1, implementation cleanup