Revert "updates & cleanup"

This reverts commit ad6938a24361be808cb622615dbdbc77319d3230.