Remove some unintentiol diffs from master