Removed misc comps