Cleaning up after shitty merge