GPL3 and code cleanup