Clean up code

Reviewer: Tiff Go (post commit)

Issue: None