Revert "ion"

This reverts commit 63c4cb9e52d183a3ed4cdd846e8ee8042a98a3b0.
Cleanup