Cleanup.  Moved potential common code into core module.