#481 cleanup