Remove remainder of goriot implementation