1579 cleanup