More stonecutter cleanup