fix and remove analytics