More cleanups, now to update to forge build 931