Removed diff related code in anticipation of new splitter