fixing the load logic
Revert "fixing the load logic"

This reverts commit 22cd46d766da17f206ddda76b6d7064108767a53.
fixing the load logic
prepping for better workspace removal