Revert "updates & cleanup"

This reverts commit ad6e33d3d81bba841447f820582fea62c1d19c76.