Removed some hardcode