Moved optional addons into an array in order to use a single rm -rf