remove some hardcoded stuff