removing some hardcode