Fixes for Beta6
Only remove pieces if they are actually used.