squash interface cleanup
more locking