extra cleanup from last commit