#398 cleanup