Removed NODE_ENV check