Removed remove-parts for faster installation