Updated support library, removed some unused code, and updated some
comments.