Maybe these two methods can just be deleted now?