Made the boiler plate removals actually work :)