Looks like old code that can be removed?