Cleanup and Boostrap converstions