Remove from/import and update to 5.4