Included clean-up Android code