remove some other weird code :-|