Final changes to deprecated settings