clean up config and android manifest