Clean App package (merged with Cli)