Improve parts deletion and stripping behavior