Cleaning
Minor change to allow other expansions can work