remove hardcoded variables