remove some hardcoded stuff and update name