Removed Android Bootstrap things
Refactored from Android Bootstrap removal