Remove APP_NAME conditoinal