removing dead code (default schema variable and corresponding changes)