Cleaned up mutation parts