#29 cleanup