Reimplement two methods, remove old code