Last cleanup before version 1.0.0