remove hardcoded return value