Added removal of parts