Some extra clean up