Language cleanup, patching issue where things run when not configured