removed analytics, added default defines