code/test cleanup