Remove some hardcoded dimensions.