Do I still need to remove the change from my commits? Actually I'm not quite sure on how to split this commit up.