Add i9100g and code cleanup