Clean up bashrc support new sandbox layout