Cleaned up after a strange merge