Basic cleanup before publishing...