Removed /_dpr and /retired; other minor changes