Remove App Groups and simplify download logic