Cleanup; optimized bonded interactions