extra cleanup

more clean up from compatibility update