the Android Context should be optional
Land #6, remove android context