Removed some hardcoded stuff