Re #7452 Cleaned up setup propoerties