Yeah, this should clearly be removed too ... :-)