Revert "updates & cleanup"

This reverts commit 52c2eefafdcd9b9c777a9a010270f28ef88eaaf3.