Cleanup; license changed to GPLv3