cleaned up mess from merge