cleanup
add analytics, cleanup