more cleanup, disallow going to the baaad place