Remove the old controller and persistent storage classes