remove hardcode