Move system app remover and some cleanup