Removed more hard-coded values.