Cleaning some messed up stuff