There are still many version checks in the code, so I would preffer to clean it all at once and keep this change set consistent.