Cleaning up some unused functions