Clean hardcoded constants