Fixed the clients to not add the commands and applications transitively for clusters and commands respectively.