Cleaning up refs #46