Added more analytics
Removed properties files