remove hard coded constants