Removed remaining hard coded values