moving to 3rd party providers and some ceaning up