WHISTLE-1510: clean up logging/specs/exports