more cleanup stuff and trying to find why it's breaking