Cleaned up mess from rebase