cleanup - preparing for v3.0.0