remove deprecated inner classes