Merge "remove 2016 logger aspects + verify audit score"