fix bottleneck
cleanup