Replacing all of the Android code with the updated, clean code.