Removed seperation of env setup and routes