clean up
fix api connection