Cleans up some unused code