Revert "updates & cleanup"

This reverts commit 4feff11a614e088209cccf206cf4b2dac6a9762d.