Removed duplicate. Added/updated stack traces. Cleanups.