Final clean

Last cleanup before release