code cleanup

+ attempt at fixing the debug spam in DEV branch