Removing unnecessary parts