GPL3 cleanup