#221 cleanup