Removed old code.  Removed references to temporary class copies in favor of the embedded libs