Removing code that is now in header