Remove hardcoded variables