Clean up code due to the include of Android SDK annotation.