The changes in this file simply kill code that was moved.