cleanup!

This reverts commit 90105d5397269e85f69d85dd6766ea00ba79ee7c.