Removed environment check