removed some hardcoded nonsense