modal cleanup, also remove dependencies on google services