Complete removing deprecated function

This was really because I forgot to stage some additional files.