Cleaned up stuff that made its way back in