Cleaned up some remnant code.