some long-needed cleanup