Removed hard-coded values