Removing some wrongly hard-coded values