upgrade freedom, cleanup