Some clean-up + add google bootanimation as default