Revert "Cleanup"

This reverts commit de9287a0f645db4a90a01a94ccd6f33adc565308.
Reverting to 1.5.2:
Revert "Update for 1.6"

This reverts commit 29e4a8d00fb4e278258704d85a1e78b082d8692c.