LP 1772053: Cleanup Dan's code.