Revert "updates & cleanup"

This reverts commit b68606ec6ea439f128284b4eea84b8e323c32b7a.