Revert "some other Slim Beam changes"

This reverts commit 43ee247ebee40b08fede85ef07420ce45a3d4228.
Revert "changes for Slim Bean"

This reverts commit a7abdd4835c8661b06fa0236bb3f03d766e939c7.