code cleanup

+attempt to reduce debug spam in DEVbranch