Rename
Remove deprecated flags