Removed debug - use env vars in replacements