Final cleanup before jar release