Trying to clean up messy merge