#456 - cleanup