12-10-14 cleanup