Cleaning up site defaults