Presumably this stuff should be removed?