Issue #24: cleanup, ensure that we never go over capacity