Removing code is always fun :-)