clean up and typecount test passing