Revert "updates & cleanup"

This reverts commit e95c356c4a109f1c80685606a2ead8b7f4c21467.