rid of log statements and include analytics