Revert "updates & cleanup"

This reverts commit fe650ccaa07b0b5a44977a9eb210ca7c25f11a90.