Removing code that was lingering from previous forked project