Rework remove action for parts