Deleted internationalization
Added keystore
Use production service instead of mock service