Clean up mess from bad merge