remove some hardcoded values