remove hardcoded constants