Fix own piece removal
Performance improvements and monitoring