Removed extra code that got accidentally added to this branch.