Merge "remove unused/deprecated flags from savelayer"