Cleaning up some references