refs #1 - First cleanup