Some final cleaning up