Removed active android need to go through code and fix everything