Removed environment variables check